packages/ui/src/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx (1)

90-166: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Missing coverage for the free-plan (primary) and loading-state paths.

Both new tests only cover a paid plan (isDefault: false → secondary colorScheme). Per the PR objective, free plans should render with the primary color scheme, and there's also an animated loading state (LoadingBadge) rendered while the subscription is being resolved — neither is exercised here. As per path instructions, **/*.{test,spec}.{ts,tsx,js,jsx} requires that "Unit tests are required for all new functionality" and to "Verify proper error handling and edge cases."

Consider adding:

• A test with isDefault: true asserting the primary colorScheme is applied.
• A test asserting the pulsing LoadingBadge renders while getSubscription is pending.

Do you want me to draft these additional test cases?

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@packages/ui/src/components/OrganizationSwitcher/__tests__/OrganizationSwitcher.test.tsx`
around lines 90 - 166, Add coverage in OrganizationSwitcher tests for both
missing paths: configure the mocked subscription plan with isDefault: true and
assert the rendered plan badge uses the primary color scheme, then keep
getSubscription pending and assert the animated LoadingBadge appears during
resolution. Reuse the existing fixtures and showPlanName setup while preserving
the paid-plan and billing-disabled tests.

Source: Path instructions

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

packages/shared/src/types/clerk.ts (1)

2234-2234: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Consider extracting the inline function type for reuse.

The return type () => Promise<{ label: string; slug: string; colorScheme?: 'primary' | 'secondary' }> is duplicated verbatim in OrganizationSwitcherTrigger.tsx (line 151). Extracting a named type (e.g., RenderPlanBadgeResult) would keep the contract in sync if the shape changes.

♻️ Proposed type extraction

+export type PlanBadgeData = {
+  label: string;
+  slug: string;
+  colorScheme?: 'primary' | 'secondary';
+};
+
     renderPlanBadge?: boolean | (() => Promise<PlanBadgeData>);

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/shared/src/types/clerk.ts` at line 2234, Extract the duplicated
render-plan-badge callback result shape into a named shared type, such as
RenderPlanBadgeResult, in the shared Clerk types. Update the renderPlanBadge
declaration and OrganizationSwitcherTrigger.tsx callback type to reference it,
preserving the existing fields and optional colorScheme contract.

Source: Coding guidelines

packages/ui/src/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx (1)

158-167: 🩺 Stability & Availability | 🔵 Trivial | ⚡ Quick win

Add cleanup to CustomRenderPlanBadge's useEffect.

The async IIFE has no cleanup — if the component unmounts before the promise resolves, setState fires on an unmounted component and the async operation continues unnecessarily. Add an isMounted guard.

🔒 Proposed fix

   useEffect(() => {
+    let isMounted = true;
     (async () => {
       try {
         const data = await renderPlanBadge();
-        setState({ isLoading: false, data });
+        if (isMounted) setState({ isLoading: false, data });
       } catch {
-        setState({ isLoading: false, data: null });
+        if (isMounted) setState({ isLoading: false, data: null });
       }
     })();
+    return () => { isMounted = false; };
   }, [renderPlanBadge]);

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@packages/ui/src/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx`
around lines 158 - 167, Update the useEffect invoking renderPlanBadge in
CustomRenderPlanBadge with an isMounted guard: set it true before starting the
async operation, check it before both setState calls, and return cleanup that
marks it false. Preserve the existing loading, success, and error state values
while preventing updates after unmount.